Skip to content

packages: Move from our own containerd v1 RPM to containerd.io v2 RPM from docker repo#4821

Open
TeddyAndrieux wants to merge 2 commits intodevelopment/133.0from
improvement/mk8s-151-migrate-to-containerd.io
Open

packages: Move from our own containerd v1 RPM to containerd.io v2 RPM from docker repo#4821
TeddyAndrieux wants to merge 2 commits intodevelopment/133.0from
improvement/mk8s-151-migrate-to-containerd.io

Conversation

@TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented Mar 17, 2026 •
edited by atlassian bot
Loading

Let's migrate to the official containerd package from docker repository and no longer build and maintain our own containerd package.

Due to this change, downgrade is not supported from 133 to 132, it could be possible to handle this case but it would require extra work to downgrade containerd and config before running the downgrade since "old" salt states cannot be used to perform this downgrade since containerd.io version we install "obsoletes" the containerd version we have in older version.

That's why we decided to not support this downgrade path.

This PR also leverage the usage of config_path for containerd mirrors so that we do not need to restart containerd on registry mirror changes

Fixes: MK8S-151

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner March 17, 2026 16:52
@bert-e
Copy link
Contributor

bert-e commented Mar 17, 2026

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Mar 17, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/mk8s-151-migrate-to-containerd.io branch from 4dc4b37 to c67a534 Compare March 17, 2026 17:03
@TeddyAndrieux
salt: Configure containerd registries using dedicated config
7754f68 
Using this config_path patern allow to change the
registries configuration without restarting the containerd service
@TeddyAndrieux
build: Move from our own containerd to containerd.io
14b2ab5 
Let's migrate to the official containerd package from
docker repository and no longer build and maintain our own
containerd package.

Due to this change, downgrade is not supported from 133 to 132,
it could be possible to handle this case but it would require
extra work to downgrade containerd and config before running
the downgrade since "old" salt states cannot be used to perform
this downgrade since `containerd.io` version we install "obsoletes"
the `containerd` version we have in older version.

That's why we decided to not support this downgrade path.

Fixes: MK8S-151
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/mk8s-151-migrate-to-containerd.io branch from c67a534 to 14b2ab5 Compare March 17, 2026 20:33
@bert-e
Copy link
Contributor

bert-e commented Mar 17, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Mar 18, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Mar 19, 2026

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

TeddyAndrieux commented Mar 19, 2026

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 19, 2026

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/133.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.0
  • development/132.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@m4nch0t m4nch0t m4nch0t approved these changes

@ezekiel-alexrod ezekiel-alexrod ezekiel-alexrod approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@TeddyAndrieux @bert-e @m4nch0t @ezekiel-alexrod